Merge "Remove ApiBase::createContext() (deprecated since 1.19)"

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 41b8473..349b7b2 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -191,6 +191,7 @@ changes to languages because of Bugzilla reports.
 * Removed ImageGalleryBase::useSkin(). (deprecated since 1.18)
 * Removed DatabaseMysqlBase::getLagFromProcesslist(). (deprecated since 1.19)
 * Removed LoadBalancer::closeConnecton(). (deprecated since 1.18)
+* Removed ApiBase::createContext(). (deprecated since 1.19)
 
 ==== Renamed classes ====
 * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 25a1714..d221799 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -223,21 +223,6 @@ abstract class ApiBase extends ContextSource {
                return $this->getResult()->getData();
        }
 
-       /**
-        * Create a new RequestContext object to use e.g. for calls to other parts
-        * the software.
-        * The object will have the WebRequest and the User object set to the ones
-        * used in this instance.
-        *
-        * @deprecated since 1.19 use getContext to get the current context
-        * @return DerivativeContext
-        */
-       public function createContext() {
-               wfDeprecated( __METHOD__, '1.19' );
-
-               return new DerivativeContext( $this->getContext() );
-       }
-
        /**
         * Set warning section for this module. Users should monitor this
         * section to notice any changes in API. Multiple calls to this